Only wrap if we are in the topmost menu. (#160936, John Finlay)

2004-12-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level)
	(gtk_combo_box_menu_row_changed): Only wrap if we are in the
	topmost menu.  (#160936, John Finlay)

diff --git a/ChangeLog b/ChangeLog
index 7d21818a203b1dfce6a49cc12e67dcaf015f5568..651b0b6f3e400a23d0b085fbc10e56f5c6cda52a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) 
+       (gtk_combo_box_menu_row_changed): Only wrap if we are in the
+       topmost menu.  (#160936, John Finlay)
+
 2004-12-10  Matthias Clasen  <mclasen@redhat.com>
 
        Support no-Alt mnemnonics in menu bars  (#101309, Owen Taylor)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7d21818a203b1dfce6a49cc12e67dcaf015f5568..651b0b6f3e400a23d0b085fbc10e56f5c6cda52a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-12-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) 
+       (gtk_combo_box_menu_row_changed): Only wrap if we are in the
+       topmost menu.  (#160936, John Finlay)
+
 2004-12-10  Matthias Clasen  <mclasen@redhat.com>
 
        Support no-Alt mnemnonics in menu bars  (#101309, Owen Taylor)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7d21818a203b1dfce6a49cc12e67dcaf015f5568..651b0b6f3e400a23d0b085fbc10e56f5c6cda52a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-12-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) 
+       (gtk_combo_box_menu_row_changed): Only wrap if we are in the
+       topmost menu.  (#160936, John Finlay)
+
 2004-12-10  Matthias Clasen  <mclasen@redhat.com>
 
        Support no-Alt mnemnonics in menu bars  (#101309, Owen Taylor)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7d21818a203b1dfce6a49cc12e67dcaf015f5568..651b0b6f3e400a23d0b085fbc10e56f5c6cda52a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-12-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) 
+       (gtk_combo_box_menu_row_changed): Only wrap if we are in the
+       topmost menu.  (#160936, John Finlay)
+
 2004-12-10  Matthias Clasen  <mclasen@redhat.com>
 
        Support no-Alt mnemnonics in menu bars  (#101309, Owen Taylor)

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 60f5c5bd5cfe5d6dab9422d645905c8fc2cdd08d..0d349037cf0a802a7e0af6dad83ae6c70efbe4ea 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2502,7 +2502,7 @@ gtk_combo_box_menu_fill_level (GtkComboBox *combo_box,
        }
       
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-      if (combo_box->priv->wrap_width)
+      if (combo_box->priv->wrap_width && menu == combo_box->priv->popup_widget)
         gtk_combo_box_relayout_item (combo_box, item, &iter, last);
       gtk_widget_show (item);
       
@@ -3054,7 +3054,8 @@ gtk_combo_box_menu_row_changed (GtkTreeModel *model,
       gtk_combo_box_menu_row_inserted (model, path, iter, combo_box);
     }
 
-  if (combo_box->priv->wrap_width)
+  if (combo_box->priv->wrap_width
+      && item->parent == combo_box->priv->popup_widget)
     gtk_combo_box_relayout_item (combo_box, item, iter, NULL);
 
   width = gtk_combo_box_calc_requested_width (combo_box, path);